Fix 'xm vcpu-list'. List cpumap as 'CPU Affinity'. Use

special descriptive strings for empty and full cpu maps.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index f9771f6c0af2fa2dd58bc932b021a6c364ae47d0..2949ff157c618b8d313f6c56241f7b7c0bfb243c 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -274,7 +274,7 @@ def xm_brief_list(doms):
 
 
 def xm_vcpu_list(args):
-    print 'Name                              ID  VCPU  CPU  State  Time(s)  CPU Map'
+    print 'Name                              ID  VCPU  CPU  State  Time(s)  CPU Affinity'
 
     from xen.xend.XendClient import server
     if args:
@@ -319,6 +319,8 @@ def xm_vcpu_list(args):
         # Convert pairs to range string, e.g: [(1,2),(3,3),(5,7)] -> 1-2,3,5-7
         #
         def format_pairs(pairs):
+            if not pairs:
+                return "no cpus"
             out = ""
             for f,s in pairs:
                 if (f==s):
@@ -330,25 +332,23 @@ def xm_vcpu_list(args):
             return out[:-1]
 
         def format_cpumap(cpumap):
-            def uniq(x):
-               return [ u for u in x if u not in locals()['_[1]'] ]
+            cpumap = map(lambda x: int(x), cpumap)
+            cpumap.sort()
 
             from xen.xend.XendClient import server
             for x in server.xend_node()[1:]:
                 if len(x) > 1 and x[0] == 'nr_cpus':
                     nr_cpus = int(x[1])
+                    cpumap = filter(lambda x: x < nr_cpus, cpumap)
+                    if len(cpumap) == nr_cpus:
+                        return "any cpu"
                     break
  
-            return format_pairs(
-                          list_to_rangepairs(
-                              map(lambda x: x % nr_cpus, 
-                                  uniq(map(lambda x: int(x), cpumap)) )))
-                
+            return format_pairs(list_to_rangepairs(cpumap))
 
         name  =     get_info('name')
         domid = int(get_info('domid'))
 
-
         for vcpu in sxp.children(dom, 'vcpu'):
             def vinfo(n, t):
                 return t(sxp.child_value(vcpu, n))